Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use 2of2 multisig deposit tx version for manual payout #3694

Merged

Conversation

chimp1984
Copy link
Contributor

With v1.2 we use 2of2 multisig for deposit tx. This commit changes the
manual payout window to reflect that.

  • Remove unused code from legacy arbitration
  • Fix comments

With v1.2 we use 2of2 multisig for deposit tx. This commit changes the
manual payout window to reflect that.

- Remove unused code from legacy arbitration
- Fix comments
@julianknutsen
Copy link
Contributor

Do either of these need to make it into v1.2.4?

@chimp1984
Copy link
Contributor Author

Do either of these need to make it into v1.2.4?

Not super important, but this one might be useful in case we need a manual payout with a 1.2. trade.

Copy link
Contributor

@ripcurlx ripcurlx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK - I'll cherry-pick this into the release branch

@ripcurlx ripcurlx merged commit b25a793 into bisq-network:master Nov 27, 2019
@chimp1984 chimp1984 deleted the use-2of2-multisig-for-manual-payout branch December 7, 2019 04:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants